feat(sidebar): 构建工作空间会话树并支持独立置顶排序 - #770
Merged
Merged
Conversation
5 tasks done
ccl688
pushed a commit
to ccl688/LiveAgent
that referenced
this pull request
Sep 11, 2026
冲突解决：\n- agent-ui ChatHistorySidebar.tsx / ChatHistorySidebarTypes.ts：以上游重写（会话树、资源入口统一、会话操作菜单 Stack-Cairn#768 Stack-Cairn#770 Stack-Cairn#783）为基底，叠加本地 workflow 可选入口（SidebarExtraEntryContext + onOpenWorkflow/workflowActive），两侧改动均保留\n- agent-gui TaskDetail.tsx：上游 Stack-Cairn#766 从 ConfirmDialogOptions 移除 tone，删除 3 处残留 tone 引用\n\n合并后校验：typecheck:ui、agent-gateway/web tsc（noEmit）、agent-gui tsc（noEmit）均通过
zjt-dev
added a commit
to zjt-dev/LiveAgent
that referenced
this pull request
Sep 17, 2026
合并 main（12 个提交，含 Stack-Cairn#768 资源管理入口、Stack-Cairn#770 工作空间会话树、 Stack-Cairn#783 会话操作菜单、Stack-Cairn#792/Stack-Cairn#796 provider 修复、Stack-Cairn#800 长会话渲染性能、 Stack-Cairn#801 进程回收、Stack-Cairn#802/Stack-Cairn#804 修复）。 冲突 3 处，均手工解决： 1. crates/agent-gui/src-tauri/src/commands/workspace/fs.rs spawn_workspace_open_command（Windows 分支）：保留本分支的 shell API reveal（explorer_target 去 \\?\ 前缀 + reveal_item_in_dir）回退链， 同时改用 main 引入的 spawn_and_reap 收尸，两边意图都保留。 2. crates/agent-ui/src/components/chat/ChatHistorySidebar.tsx 设置按钮：保留本分支的 min-w-0（修 flex 溢出），采纳 main 的显式 onClick={() => onOpenSettings()}。两边 onOpenSettings 签名均为 () => void。 3. crates/agent-ui/src/lib/settings/sync.ts 采纳 main 新增的 sidebarShortcuts 跨端同步字段；本分支的本地字段 （gitCommitMessagePrompt / themePresetId / backgroundImage / backgroundOpacity）保持。顺带修正本分支一条放错位置的注释——它描述的是 本地字段，却插在会同步的 composerContextDisplay 上方，已归位到本地字段块。 自动合并但需注意的两处： - git.rs：本分支改调用方 open_system_file_location，main 改被调用方 spawn_system_file_manager，互不重叠，结果并存。 - managed_process.rs / process.rs：结果等同于 main 版本。 验证：agent-ui / agent-gui / agent-gateway-web 三包 tsc --noEmit 全通过； biome 全通过；agent-gui 前端 3167/3167、webui 725/725、脚本测试 12/12、 UI 边界检查通过。
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Linked issue
Closes #769
Summary
将 Desktop 与 WebUI 的侧栏改为工作空间会话树：可以同时展开多个工作空间浏览历史，置顶会话与置顶工作空间归入独立区域，并按用户拖拽顺序持久化展示。
Change scope
agent-ui/agent-gui/ Gateway WebUI / Tauri 系统设置持久化。crates/agent-ui/src/components/chat/ChatHistorySidebar*.tsx、WorkspaceCloneModal.tsx。crates/agent-ui/src/lib/sidebar/、设置类型与规范化、工作空间排序及翻译。useTauriFileDrop.ts。crates/agent-gui/src-tauri/src/commands/config/settings/。docs/features/history-compaction.md与对应回归测试。Screenshots / preview
共享侧栏组件的交互预览（使用演示数据）：独立置顶区域、工作空间行、拖拽标题和蓝色插入线。Desktop 与 WebUI 均已实际打开验证；以下截图分别展示深色和浅色主题。
Verification
git diff --check通过。现有未修改文件仍有非阻断 lint 提示，GUI 大 chunk 提示保留。cargo test -p liveagent save_system --lib：7 项通过，覆盖排序与归档元数据保存、关闭数据库后重新打开，以及修改无关设置后保留排序。Pre-submit checklist